merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 14 Dec 2012 11:00:18 +0000 (20:00 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Dec 2012 11:00:18 +0000 (20:00 +0900)
commit0742bd2476826e969fefc65c45fdb9eaad7f5d04
tree35735befe66ea969115d9e88365fb3b3c7e94116
parent90fb846f2fe64e65dce9d650914d8935ee730b4b
parentc20f73f6d3aacc352676912f649e41852601600e
merge emacs-24